Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 12 Jul 2010 13:21:11 +0000 (13:21 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 12 Jul 2010 13:21:11 +0000 (13:21 +0000)
commit09c1eeffe2c59d91169575b1ddafd982c7e19b35
treeb44aedc481b5e2aad23ea210b5c61b0e58a08462
parentbc1c80aa5ea655bbc14da95630f2adafabae3efb
parent3888bba2131a052ffe29be971c2c0a7539d89715
Merge from mainline.